Auto merge of #4145 - rust-lang:matklad-patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 8 Jun 2017 14:54:36 +0000 (14:54 +0000)
committerbors <bors@rust-lang.org>
Thu, 8 Jun 2017 14:54:36 +0000 (14:54 +0000)
Fix flaky test

closes #4144.


Trivial merge